From f1fd598fefb6d2b656c8911c3d5f3481f3c117fe Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Thu, 16 Sep 2004 05:05:38 +0000
Subject: [PATCH] Bring in rest of makefile & integration voodoo for USB.

---
 gpsbabel/Makefile          | 6 ++++--
 gpsbabel/jeeps/garminusb.h | 2 +-
 gpsbabel/jeeps/gpslibusb.c | 2 ++
 gpsbabel/jeeps/gpsusbwin.c | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index 9a524f6a8..26e9182b9 100644
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -16,7 +16,7 @@ INHIBIT_USB=-DNO_USB
 OPTIMIZATION=-O $(EXTRA_OPTIMIZATION)
 DEBUGGING=-g $(EXTRA_DEBUGGING)
 # add -DDEBUG_MEM to turn on memory allocation logging
-CFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -Icoldsync $(INHIBIT_EXPAT) $(OPTIMIZATION)
+CFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -Icoldsync $(INHIBIT_EXPAT) $(INHIBIT_USB) $(OPTIMIZATION)
 INSTALL_TARGETDIR=/usr/local/
 
 FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \
@@ -29,10 +29,12 @@ FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin_tables.o \
 
 FILTERS=position.o duplicate.o arcdist.o polygon.o smplrout.o reverse_route.o sort.o stackfilter.o
 
+OSJEEPS=jeeps/gpslibusb.o
 JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
 	jeeps/gpsmath.o jeeps/gpsmem.o  \
 	jeeps/gpsprot.o jeeps/gpsread.o \
-	jeeps/gpsrqst.o jeeps/gpssend.o jeeps/gpsserial.o jeeps/gpsutil.o
+	jeeps/gpsrqst.o jeeps/gpssend.o jeeps/gpsserial.o jeeps/gpsutil.o \
+	jeeps/gpsusbread.o jeeps/gpsusbsend.o jeeps/gpsusbstub.o $(OSJEEPS)
 # Extra modules in Jeeps that we don't use
 # 	jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
 
diff --git a/gpsbabel/jeeps/garminusb.h b/gpsbabel/jeeps/garminusb.h
index eb448b67f..edc7b800d 100644
--- a/gpsbabel/jeeps/garminusb.h
+++ b/gpsbabel/jeeps/garminusb.h
@@ -55,4 +55,4 @@ struct {
 int gusb_cmd_send(const garmin_usb_packet *obuf, size_t sz);
 int gusb_cmd_get(garmin_usb_packet *ibuf, size_t sz);
 int gusb_open(const char *portname);
-int gusb_close(void);
+int gusb_close(const char *portname);
diff --git a/gpsbabel/jeeps/gpslibusb.c b/gpsbabel/jeeps/gpslibusb.c
index ea283ffcd..d50438415 100644
--- a/gpsbabel/jeeps/gpslibusb.c
+++ b/gpsbabel/jeeps/gpslibusb.c
@@ -1,3 +1,4 @@
+#if !defined(NO_USB)
 /*
     Physical/OS USB layer to talk to libusb.
 
@@ -234,3 +235,4 @@ Xmain()
 		garmin_usb_scan();
 }
 #endif
+#endif /* !defined(NO_USB) */
diff --git a/gpsbabel/jeeps/gpsusbwin.c b/gpsbabel/jeeps/gpsusbwin.c
index 26e21c980..e99557b6a 100644
--- a/gpsbabel/jeeps/gpsusbwin.c
+++ b/gpsbabel/jeeps/gpsusbwin.c
@@ -1,3 +1,4 @@
+#if !defined(NO_USB)
 /*
     Windows layer of Garmin/USB protocol.
 
@@ -292,3 +293,4 @@ char ocmd2[] = {0x14, 00, 00, 00, 0xfe, 00, 00, 00, 00, 00, 00, 00};
 	usb_intr_get();
 }
 #endif
+#endif /* !defined(NO_USB) */
-- 
2.30.2